Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 27 Apr 2010 23:38:41 +0000 (23:38 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 27 Apr 2010 23:38:41 +0000 (23:38 +0000)

Trivial merge